Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Sep 2011 00:16:40 +0000 (17:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Sep 2011 00:16:40 +0000 (17:16 -0700)

Trivial merge